This time, the file was unable to be checked out, perhaps because of a merge conflict during checkout.
此时文件无法签出,可能是因为在签出期间发生了合并冲突。
If it turns out that some of the changes conflict with one another, the merge is considered nontrivial, because someone must make decisions about which of the conflicting changes should prevail.
如果出现某些变化同另外一个变化相冲突的情况,那么合并就被认为是重要的,这是由于某个人必须决定哪一个冲突的变化应当获胜。
Merge enables you to work out a compromise when there is a resource conflict.
融合使您能够在资源冲突时找到折中的方案。
应用推荐